Add 103 Garmin symbols to tables and doc from new protocol spec.

diff --git a/garmin_tables.c b/garmin_tables.c
index b054747b0814667aeb488f40b0c2b54894331fbd..5e0811f9c1bd80a0feacab8a7fe69bdc6f0828a8 100644 (file)
--- a/garmin_tables.c
+++ b/garmin_tables.c
@@ -216,6 +216,101 @@ icon_mapping_t garmin_icon_table[] = {
        {   159,   188, "Weed Bed" }, 
        {   160,   189, "Dropoff" }, 
        {   161,   190, "Dock" }, 
+
+       /* New in Garmin protocol spec from June 2006.  Extracted from
+        * spec and fed through some horrible awk to add ones we didn't 
+        * have before but normalized for consistency. */
+       { -1,  8359, "Asian Food" },
+       { -1,  8296, "Blue Circle" },
+       { -1,  8299, "Blue Diamond" },
+       { -1,  8317, "Blue Letter A" },
+       { -1,  8318, "Blue Letter B" },
+       { -1,  8319, "Blue Letter C" },
+       { -1,  8320, "Blue Letter D" },
+       { -1,  8341, "Blue Number 0" },
+       { -1,  8342, "Blue Number 1" },
+       { -1,  8343, "Blue Number 2" },
+       { -1,  8344, "Blue Number 3" },
+       { -1,  8345, "Blue Number 4" },
+       { -1,  8346, "Blue Number 5" },
+       { -1,  8347, "Blue Number 6" },
+       { -1,  8348, "Blue Number 7" },
+       { -1,  8349, "Blue Number 8" },
+       { -1,  8350, "Blue Number 9" },
+       { -1,  8302, "Blue Oval" },
+       { -1,  8305, "Blue Rectangle" },
+       { -1,  8308, "Blue Square" },
+       { -1,  8351, "Blue Triangle" },
+       { -1,  8254, "Border Crossing (Port Of Entry)" },
+       { -1,   182, "Bottom Conditions" },
+       { -1,  8360, "Deli" },
+       { -1,  8228, "Elevation point" },
+       { -1,  8229, "Exit without services" },
+       { -1, 16398, "First approach fix" },
+       { -1,  8250, "Gambling/casino" },
+       { -1,  8232, "Geographic place name, land" },
+       { -1,  8230, "Geographic place name, Man-made" },
+       { -1,  8231, "Geographic place name, water" },
+       { -1,  8295, "Green circle" },
+       { -1,  8313, "Green Letter A" },
+       { -1,  8315, "Green Letter B" },
+       { -1,  8314, "Green Letter C" },
+       { -1,  8316, "Green Letter D" },
+       { -1,  8331, "Green Number 0" },
+       { -1,  8332, "Green Number 1" },
+       { -1,  8333, "Green Number 2" },
+       { -1,  8334, "Green Number 3" },
+       { -1,  8335, "Green Number 4" },
+       { -1,  8336, "Green Number 5" },
+       { -1,  8337, "Green Number 6" },
+       { -1,  8338, "Green Number 7" },
+       { -1,  8339, "Green Number 8" },
+       { -1,  8340, "Green Number 9" },
+       { -1,  8301, "Green Oval" },
+       { -1,  8304, "Green Rectangle" },
+       { -1,  8352, "Green Triangle" },
+       { -1, 16385, "Intersection" },
+       { -1,  8201, "Intl freeway hwy" },
+       { -1,  8202, "Intl national hwy" },
+       { -1,  8361, "Italian food" },
+       { -1,  8248, "Large exit without services" },
+       { -1,  8247, "Large Ramp intersection" },
+       { -1, 16399, "Localizer Outer Marker" },
+       { -1, 16400, "Missed approach point" },
+       { -1, 16386, "Non-directional beacon" },
+       { -1,   168, "Null" },
+       { -1,   180, "Open 24 Hours" },
+       { -1,  8222, "Ramp intersection" },
+       { -1,  8294, "Red circle" },
+       { -1,  8309, "Red Letter A" },
+       { -1,  8310, "Red Letter B" },
+       { -1,  8311, "Red Letter C" },
+       { -1,  8312, "Red Letter D" },
+       { -1,  8321, "Red Number 0" },
+       { -1,  8322, "Red Number 1" },
+       { -1,  8323, "Red Number 2" },
+       { -1,  8324, "Red Number 3" },
+       { -1,  8325, "Red Number 4" },
+       { -1,  8326, "Red Number 5" },
+       { -1,  8327, "Red Number 6" },
+       { -1,  8328, "Red Number 7" },
+       { -1,  8329, "Red Number 8" },
+       { -1,  8330, "Red Number 9" },
+       { -1,  8300, "Red Oval" },
+       { -1,  8303, "Red Rectangle" },
+       { -1,  8353, "Red Triangle" },
+       { -1,  8362, "Seafood" },
+       { -1,  8194, "State Hwy" },
+       { -1,  8363, "Steak" },
+       { -1,  8223, "Street Intersection" },
+       { -1, 16401, "TACAN" },
+       { -1,   183, "Tide/Current PRediction Station" },
+       { -1,   191, "U Marina" },
+       { -1,  8193, "US hwy" },
+       { -1,   193, "U stump" },
+       { -1, 16387, "VHF Omni-range" },
+       { -1, 16397, "VOR-DME" },
+       { -1, 16396, "VOR/TACAN" },
        
        {    -1,    -1, NULL },
 };

diff --git a/mkicondoc.c b/mkicondoc.c
index 1e2d6298f40de5feba029d590100c496b0318df5..c099dc5dbeb293419b8fcff9ff7f3d5bf71e04c7 100644 (file)
--- a/mkicondoc.c
+++ b/mkicondoc.c
@@ -8,12 +8,16 @@ tbl_ent(int n, ...)
        char *t;
        va_list args;
        va_start(args, n);
-
+#if 0
        for (i = 0; i < n; i++) {
                t = va_arg(args, char *);
 printf("%s%s", i > 0 ? "," : "", t);
                
        }
+#else
+       t = va_arg(args, char*);
+       printf("<member>%s</member>", t);
+#endif
 printf("\n");
        va_end(args);
        

diff --git a/xmldoc/chapters/garmin_icons.xml b/xmldoc/chapters/garmin_icons.xml
index 9b0ef3a01e21642131ae5e51b331d5e5e291f205..8c93e6393260d1ea7a6960b21d6be17ad7cf9d25 100644 (file)
--- a/xmldoc/chapters/garmin_icons.xml
+++ b/xmldoc/chapters/garmin_icons.xml
@@ -18,6 +18,7 @@ formats.
 <member>Airport</member>
 <member>Amusement Park</member>
 <member>Anchor Prohibited</member>
+<member>Asian Food</member>
 <member>Ball Park</member>
 <member>Bank</member>
 <member>Bar</member>
@@ -25,7 +26,29 @@ formats.
 <member>Beacon</member>
 <member>Bell</member>
 <member>Bike Trail</member>
+<member>Blue Circle</member>
+<member>Blue Diamond</member>
+<member>Blue Letter A</member>
+<member>Blue Letter B</member>
+<member>Blue Letter C</member>
+<member>Blue Letter D</member>
+<member>Blue Number 0</member>
+<member>Blue Number 1</member>
+<member>Blue Number 2</member>
+<member>Blue Number 3</member>
+<member>Blue Number 4</member>
+<member>Blue Number 5</member>
+<member>Blue Number 6</member>
+<member>Blue Number 7</member>
+<member>Blue Number 8</member>
+<member>Blue Number 9</member>
+<member>Blue Oval</member>
+<member>Blue Rectangle</member>
+<member>Blue Square</member>
+<member>Blue Triangle</member>
 <member>Boat Ramp</member>
+<member>Border Crossing (Port Of Entry)</member>
+<member>Bottom Conditions</member>
 <member>Bowling</member>
 <member>Bridge</member>
 <member>Building</member>
@@ -67,6 +90,7 @@ formats.
 <member>Crossing</member>
 <member>Dam</member>
 <member>Danger Area</member>
+<member>Deli</member>
 <member>Department Store</member>
 <member>Diamond, Blue</member>
 <member>Diamond, Green</member>
@@ -76,9 +100,12 @@ formats.
 <member>Dock</member>
 <member>Drinking Water</member>
 <member>Dropoff</member>
+<member>Elevation point</member>
 <member>Event Cache</member>
 <member>Exit</member>
+<member>Exit without services</member>
 <member>Fast Food</member>
+<member>First approach fix</member>
 <member>Fishing Area</member>
 <member>Fishing Hot Spot Facility</member>
 <member>Fitness Center</member>
@@ -87,14 +114,36 @@ formats.
 <member>Flag, Green</member>
 <member>Flag, Red</member>
 <member>Forest</member>
+<member>Gambling/casino</member>
 <member>Gas Station</member>
 <member>Geocache</member>
 <member>Geocache Found</member>
+<member>Geographic place name, land</member>
+<member>Geographic place name, Man-made</member>
+<member>Geographic place name, water</member>
 <member>Ghost Town</member>
 <member>Glider Area</member>
 <member>Golf Course</member>
+<member>Green circle</member>
 <member>Green Diamond</member>
+<member>Green Letter A</member>
+<member>Green Letter B</member>
+<member>Green Letter C</member>
+<member>Green Letter D</member>
+<member>Green Number 0</member>
+<member>Green Number 1</member>
+<member>Green Number 2</member>
+<member>Green Number 3</member>
+<member>Green Number 4</member>
+<member>Green Number 5</member>
+<member>Green Number 6</member>
+<member>Green Number 7</member>
+<member>Green Number 8</member>
+<member>Green Number 9</member>
+<member>Green Oval</member>
+<member>Green Rectangle</member>
 <member>Green Square</member>
+<member>Green Triangle</member>
 <member>Heliport</member>
 <member>Horn</member>
 <member>Hotel</member>
@@ -102,9 +151,16 @@ formats.
 <member>Hunting Area</member>
 <member>Ice Skating</member>
 <member>Information</member>
+<member>Intersection</member>
+<member>Intl freeway hwy</member>
+<member>Intl national hwy</member>
+<member>Italian food</member>
+<member>Large exit without services</member>
+<member>Large Ramp intersection</member>
 <member>Levee</member>
 <member>Light</member>
 <member>Live Theater</member>
+<member>Localizer Outer Marker</member>
 <member>Locationless (Reverse) Cache</member>
 <member>Lodging</member>
 <member>Man Overboard</member>
@@ -114,6 +170,7 @@ formats.
 <member>Mile Marker</member>
 <member>Military</member>
 <member>Mine</member>
+<member>Missed approach point</member>
 <member>Movie Theater</member>
 <member>Multi-Cache</member>
 <member>Museum</member>
@@ -131,7 +188,10 @@ formats.
 <member>Navaid, White</member>
 <member>Navaid, White/Green</member>
 <member>Navaid, White/Red</member>
+<member>Non-directional beacon</member>
+<member>Null</member>
 <member>Oil Field</member>
+<member>Open 24 Hours</member>
 <member>Parachute Area</member>
 <member>Park</member>
 <member>Parking Area</member>
@@ -146,8 +206,27 @@ formats.
 <member>Post Office</member>
 <member>Private Field</member>
 <member>Radio Beacon</member>
+<member>Ramp intersection</member>
+<member>Red circle</member>
 <member>Red Diamond</member>
+<member>Red Letter A</member>
+<member>Red Letter B</member>
+<member>Red Letter C</member>
+<member>Red Letter D</member>
+<member>Red Number 0</member>
+<member>Red Number 1</member>
+<member>Red Number 2</member>
+<member>Red Number 3</member>
+<member>Red Number 4</member>
+<member>Red Number 5</member>
+<member>Red Number 6</member>
+<member>Red Number 7</member>
+<member>Red Number 8</member>
+<member>Red Number 9</member>
+<member>Red Oval</member>
+<member>Red Rectangle</member>
 <member>Red Square</member>
+<member>Red Triangle</member>
 <member>Reef</member>
 <member>Residence</member>
 <member>Restaurant</member>
@@ -157,6 +236,7 @@ formats.
 <member>Scales</member>
 <member>Scenic Area</member>
 <member>School</member>
+<member>Seafood</member>
 <member>Seaplane Base</member>
 <member>Shipwreck</member>
 <member>Shopping Center</member>
@@ -168,18 +248,29 @@ formats.
 <member>Small City</member>
 <member>Soft Field</member>
 <member>Stadium</member>
+<member>State Hwy</member>
+<member>Steak</member>
+<member>Street Intersection</member>
 <member>Summit</member>
 <member>Swimming Area</member>
+<member>TACAN</member>
 <member>Tall Tower</member>
 <member>Telephone</member>
+<member>Tide/Current PRediction Station</member>
 <member>Toll Booth</member>
 <member>TracBack Point</member>
 <member>Trail Head</member>
 <member>Truck Stop</member>
 <member>Tunnel</member>
+<member>U Marina</member>
+<member>U stump</member>
 <member>Ultralight Area</member>
 <member>Unknown Cache</member>
+<member>US hwy</member>
+<member>VHF Omni-range</member>
 <member>Virtual cache</member>
+<member>VOR-DME</member>
+<member>VOR/TACAN</member>
 <member>Water Hydrant</member>
 <member>Waypoint</member>
 <member>Webcam Cache</member>